From 126a5ffbb7339b98abf4214aa9800047414bf66c Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 29 Jan 2020 15:25:26 +0000 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 466005 -> 466145 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index eb8bf26f946..81d09e48da7 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -86,6 +86,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index 4938d955193fc00e02fb8ada9f643eab11feab15..42c218e1c00c07120b5d184eeb687e2d37b52c52 100644 GIT binary patch delta 168 zcmcb*L+0U5nT8g|7N!>F7M3ln{rBrL(-cZli%S%AD-`rgi;MJ=GV}CP3bNC6lS(sl zQqpn~(~GSYN-|ROxD+73!!gLk)i2&TAi&MX(LLBU0Zp}nu5Nm2i2_Vs!N^WOCACaH muQVqofh#SO%h5SLIMgXPL<4LP7s90Wp8KrZd+xKHv;hDowm7B$ delta 34 qcmaF3Q|9UpnT8g|7N!>F7M3ln{r9Ke`@$yOZuWq6yV(P_)iwYP5f29d diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index d41c40123bc..29d78aafff5 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -251,6 +251,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2